Skip to content

Conversation

@mboersma
Copy link
Contributor

@mboersma mboersma commented Nov 5, 2025

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Updates templates to use reference images from the CAPZ Community Gallery.

Some CI templates were still referencing Azure Marketplace images, which are deprecated and will no longer work for testing Kubernetes v1.35+.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests
  • cherry-pick candidate

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Nov 5, 2025
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 5, 2025
@codecov
Copy link

codecov bot commented Nov 5, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 44.54%. Comparing base (56258b2) to head (95d4870).
⚠️ Report is 2 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5960   +/-   ##
=======================================
  Coverage   44.54%   44.54%           
=======================================
  Files         279      279           
  Lines       25140    25140           
=======================================
  Hits        11199    11199           
  Misses      13128    13128           
  Partials      813      813           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@mboersma
Copy link
Contributor Author

mboersma commented Nov 5, 2025

/cherry-pick release-1.21

@k8s-infra-cherrypick-robot

@mboersma: once the present PR merges, I will cherry-pick it on top of release-1.21 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.21

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Copy link
Contributor

@nojnhuh nojnhuh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

publisher: cncf-upstream
offer: capi
sku: ubuntu-2204-gen1
computeGallery:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding to the "someday" list: refactor this kustomize so we only need to make this change in one place instead of 15.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 5, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: ee447d79149ad0a9eae11334f844940fdb5fa59a

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nojnhuh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 5, 2025
@nojnhuh
Copy link
Contributor

nojnhuh commented Nov 5, 2025

/hold for tests since I'm not sure the required jobs use these templates.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 5, 2025
sku: ubuntu-2204-gen1
computeGallery:
gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
name: capi-ubun2-2404
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the Windows images named ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1 in the Marketplace and like capi-win-2019-containerd in the compute gallery, neither I nor Copilot found a way to do both "default the variable if not set" and "replace this pattern with this" in a single envsubst expression. Maybe it would work to default the variable in ci-entrypoint, ci-conformance, and ci-e2e then only do the pattern replacement here in the template?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I tried the same. I think it's either that or change WINDOWS_SERVER_VERSION in a backward-incompatible way, so it's just "2022" instead of "windows-2022". This would be simplest but requires downstream consumers of the templates potentially to change a var in testgrid jobs.

@mboersma
Copy link
Contributor Author

mboersma commented Nov 5, 2025

/retitle Update test templates to Linux community gallery images

@k8s-ci-robot k8s-ci-robot changed the title Update test templates to community gallery images Update test templates to Linux community gallery images Nov 5, 2025
@nojnhuh
Copy link
Contributor

nojnhuh commented Nov 5, 2025

tests are green!
/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 5, 2025
@k8s-ci-robot k8s-ci-robot merged commit ba6e788 into kubernetes-sigs:main Nov 5, 2025
31 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Nov 5, 2025
@github-project-automation github-project-automation bot moved this from Todo to Done in CAPZ Planning Nov 5, 2025
@k8s-infra-cherrypick-robot

@mboersma: new pull request created: #5961

In response to this:

/cherry-pick release-1.21

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@mboersma mboersma deleted the update-templates branch November 5, 2025 20:34
@nojnhuh
Copy link
Contributor

nojnhuh commented Dec 1, 2025

Conformance jobs running against CAPZ's 1.20 branch with k/k@master are failing and this PR should fix that: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api-provider-azure#capz-periodic-conformance-k8s-ci-v1beta1-release-1-20.

It should also fix the SIG-Scalability job while kubernetes/test-infra#35632 gets reviewed: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api-provider-azure#azure-master-scalability-100.

/cherry-pick release-1.20

@k8s-infra-cherrypick-robot

@nojnhuh: #5960 failed to apply on top of branch "release-1.20":

Applying: Update test templates to community gallery images
Using index info to reconstruct a base tree...
M	templates/test/ci/cluster-template-prow-ci-version-dra.yaml
M	templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml
M	templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml
M	templates/test/ci/cluster-template-prow-ci-version-md-and-mp.yaml
A	templates/test/ci/cluster-template-prow-ci-version-windows.yaml
M	templates/test/ci/cluster-template-prow-ci-version.yaml
A	templates/test/ci/cluster-template-prow-machine-pool-ci-version-windows.yaml
M	templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
A	templates/test/ci/prow-ci-version-windows/patches/machine-deployment-ci-version-control-plane.yaml
A	templates/test/ci/prow-ci-version-windows/patches/machine-deployment-ci-version.yaml
A	templates/test/ci/prow-machine-pool-ci-version-windows/patches/machine-pool-ci-version.yaml
M	templates/test/dev/cluster-template-custom-builds-dra.yaml
M	templates/test/dev/cluster-template-custom-builds-load-dra.yaml
M	templates/test/dev/cluster-template-custom-builds-load.yaml
A	templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml
A	templates/test/dev/cluster-template-custom-builds-machine-pool-load.yaml
A	templates/test/dev/cluster-template-custom-builds-machine-pool-windows.yaml
M	templates/test/dev/cluster-template-custom-builds-machine-pool.yaml
A	templates/test/dev/cluster-template-custom-builds-windows.yaml
M	templates/test/dev/cluster-template-custom-builds.yaml
A	templates/test/dev/custom-builds-load/monitoring/patches/machine-deployment-pr-version.yaml
A	templates/test/dev/custom-builds-machine-pool-windows/patches/custom-builds.yaml
A	templates/test/dev/custom-builds-windows/patches/machine-deployment-pr-version.yaml
Falling back to patching base and 3-way merge...
Auto-merging templates/test/dev/custom-builds/patches/machine-deployment-pr-version-windows.yaml
CONFLICT (content): Merge conflict in templates/test/dev/custom-builds/patches/machine-deployment-pr-version-windows.yaml
CONFLICT (modify/delete): templates/test/dev/custom-builds-windows/patches/machine-deployment-pr-version.yaml deleted in HEAD and modified in Update test templates to community gallery images. Version Update test templates to community gallery images of templates/test/dev/custom-builds-windows/patches/machine-deployment-pr-version.yaml left in tree.
Auto-merging templates/test/dev/custom-builds-machine-pool/patches/machine-pool-deployment-pr-version-windows.yaml
CONFLICT (content): Merge conflict in templates/test/dev/custom-builds-machine-pool/patches/machine-pool-deployment-pr-version-windows.yaml
CONFLICT (modify/delete): templates/test/dev/custom-builds-machine-pool-windows/patches/custom-builds.yaml deleted in HEAD and modified in Update test templates to community gallery images. Version Update test templates to community gallery images of templates/test/dev/custom-builds-machine-pool-windows/patches/custom-builds.yaml left in tree.
Auto-merging templates/test/dev/cluster-template-custom-builds.yaml
Auto-merging templates/test/dev/cluster-template-custom-builds-machine-pool.yaml
CONFLICT (modify/delete): templates/test/dev/cluster-template-custom-builds-machine-pool-load.yaml deleted in HEAD and modified in Update test templates to community gallery images. Version Update test templates to community gallery images of templates/test/dev/cluster-template-custom-builds-machine-pool-load.yaml left in tree.
CONFLICT (modify/delete): templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml deleted in HEAD and modified in Update test templates to community gallery images. Version Update test templates to community gallery images of templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml left in tree.
Auto-merging templates/test/dev/cluster-template-custom-builds-load.yaml
CONFLICT (content): Merge conflict in templates/test/dev/cluster-template-custom-builds-load.yaml
Auto-merging templates/test/dev/cluster-template-custom-builds-load-dra.yaml
CONFLICT (content): Merge conflict in templates/test/dev/cluster-template-custom-builds-load-dra.yaml
Auto-merging templates/test/dev/cluster-template-custom-builds-dra.yaml
Auto-merging templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-windows.yaml
CONFLICT (content): Merge conflict in templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-windows.yaml
CONFLICT (modify/delete): templates/test/ci/prow-ci-version-windows/patches/machine-deployment-ci-version.yaml deleted in HEAD and modified in Update test templates to community gallery images. Version Update test templates to community gallery images of templates/test/ci/prow-ci-version-windows/patches/machine-deployment-ci-version.yaml left in tree.
Auto-merging templates/test/ci/cluster-template-prow.yaml
CONFLICT (content): Merge conflict in templates/test/ci/cluster-template-prow.yaml
Auto-merging templates/test/ci/cluster-template-prow-machine-pool.yaml
CONFLICT (content): Merge conflict in templates/test/ci/cluster-template-prow-machine-pool.yaml
Auto-merging templates/test/ci/cluster-template-prow-machine-pool-flex.yaml
CONFLICT (content): Merge conflict in templates/test/ci/cluster-template-prow-machine-pool-flex.yaml
Auto-merging templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
Auto-merging templates/test/ci/cluster-template-prow-ci-version.yaml
CONFLICT (modify/delete): templates/test/ci/cluster-template-prow-ci-version-windows.yaml deleted in HEAD and modified in Update test templates to community gallery images. Version Update test templates to community gallery images of templates/test/ci/cluster-template-prow-ci-version-windows.yaml left in tree.
Auto-merging templates/test/ci/cluster-template-prow-ci-version-md-and-mp.yaml
Auto-merging templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml
Auto-merging templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml
Auto-merging templates/test/ci/cluster-template-prow-ci-version-dra.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Update test templates to community gallery images

In response to this:

Conformance jobs running against CAPZ's 1.20 branch with k/k@master are failing and this PR should fix that: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api-provider-azure#capz-periodic-conformance-k8s-ci-v1beta1-release-1-20.

It should also fix the SIG-Scalability job while kubernetes/test-infra#35632 gets reviewed: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api-provider-azure#azure-master-scalability-100.

/cherry-pick release-1.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants